Close replay log file after replay is finished, then exit #11264

roangel · 2019-01-22T10:24:54Z

Describe problem solved by the proposed pull request
When finishing log replay, close the log file and exit process. The main problem is that right now we do not have a method implemented for px4_request_shutdown() when we are in SITL, as discussed briefly here: http://discuss.px4.io/t/bug-calibration-gazebo-sitl/9138/18

…plement exit method and add -q parameter

bkueng

Thanks @roangel, and sorry, I didn't see this earlier.

bkueng · 2019-02-07T12:51:14Z

src/platforms/common/shutdown.cpp

@@ -191,7 +191,11 @@ void shutdown_worker(void *arg)

 		} else {
 			PX4_WARN("Shutdown NOW. Good Bye.");
+#if defined __PX4_POSIX


I'd rather implement board_shutdown for SITL, then we don't need this ifdef.
px4_systemreset is incorrect here, as it's supposed to do a reboot.

bkueng · 2019-02-07T12:57:32Z

src/platforms/common/shutdown.cpp

@@ -205,7 +209,9 @@ void shutdown_worker(void *arg)
 int px4_shutdown_request(bool reboot, bool to_bootloader)
 {
 	// fail immediately if the board does not support the requested method
+#ifndef __PX4_POSIX


This ifdef should not be required if board_shutdown is implemented for SITL

stale · 2019-07-10T17:36:56Z

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

stale · 2019-07-24T18:56:41Z

Closing as stale.

julianoes · 2019-07-25T08:47:16Z

@roangel could you check the review comments so we can get this in?

roangel · 2019-08-19T11:34:06Z

I tried to do the implementation of board_shutdown method in its respective place (or at least what I think it is the place), but it is not working. Anyone has some input? Where should I put the implementation of the sitl shutdown method?

bkueng · 2019-08-19T13:05:22Z

It looks right, does board_shutdown get called? What's the output you get?

roangel · 2019-08-19T13:39:03Z

Right now the compiler throws an error:

And when I solve it by adding the needed defines to boards/px4/sitl/src/board_config.h, I stumble upon this:

Any ideas?

bkueng · 2019-08-20T07:50:00Z

This works:

diff --git a/boards/px4/sitl/src/sitl_board_shutdown.c b/boards/px4/sitl/src/sitl_board_shutdown.c
index 11a9850ff1..9ca9326a53 100644
--- a/boards/px4/sitl/src/sitl_board_shutdown.c
+++ b/boards/px4/sitl/src/sitl_board_shutdown.c
@@ -38,14 +38,15 @@
  */
 
 #include <px4_tasks.h>
-#include <drivers/boards/common/board_common.h>
+#include <board_config.h>
 
-__BEGIN_DECLS
-extern int board_shutdown(void) noreturn_function;
-static inline int board_register_power_state_notification_cb(power_button_state_notification_t cb) { return 0; }
-__END_DECLS
+int board_register_power_state_notification_cb(power_button_state_notification_t cb)
+{
+	return 0;
+}
 
-__EXPORT int board_shutdown()
+int board_shutdown()
 {
 	px4_systemreset(false);
+	return 0;
 }

…r_replay_log

…_afer_replay_log

… into pr-exit_afer_replay_log

bkueng · 2019-08-21T06:23:39Z

We're getting closer. The build fails on MacOS and Windows for the CollisionPreventionTest build because of a missing dependency.

This might solve it:

diff --git a/boards/px4/sitl/src/CMakeLists.txt b/boards/px4/sitl/src/CMakeLists.txt
index fa201136ae..063e4f71f3 100644
--- a/boards/px4/sitl/src/CMakeLists.txt
+++ b/boards/px4/sitl/src/CMakeLists.txt
@@ -36,3 +36,6 @@ add_library(drivers_board
 	sitl_led.c
 	sitl_board_shutdown.c
 )
+
+add_dependencies(drivers_board prebuild_targets)
+
diff --git a/src/modules/simulator/ledsim/CMakeLists.txt b/src/modules/simulator/ledsim/CMakeLists.txt
index c8f9cbc012..5358958c98 100644
--- a/src/modules/simulator/ledsim/CMakeLists.txt
+++ b/src/modules/simulator/ledsim/CMakeLists.txt
@@ -32,4 +32,5 @@
 ############################################################################
 
 px4_add_library(drivers__ledsim led.cpp)
-target_link_libraries(drivers__ledsim PRIVATE drivers__led drivers_board)
+target_link_libraries(drivers__ledsim PRIVATE drivers__led)
+

…r_replay_log

bkueng · 2019-08-27T13:47:25Z

I think I have it now:

diff --git a/boards/px4/sitl/src/CMakeLists.txt b/boards/px4/sitl/src/CMakeLists.txt
index 0c925b02c7..d3156ed0dc 100644
--- a/boards/px4/sitl/src/CMakeLists.txt
+++ b/boards/px4/sitl/src/CMakeLists.txt
@@ -37,4 +37,3 @@ add_library(drivers_board
 	sitl_board_shutdown.c
 )
 
-add_dependencies(drivers_board prebuild_targets)
diff --git a/platforms/posix/src/px4_layer/CMakeLists.txt b/platforms/posix/src/px4_layer/CMakeLists.txt
index ffa0638461..a7024ce972 100644
--- a/platforms/posix/src/px4_layer/CMakeLists.txt
+++ b/platforms/posix/src/px4_layer/CMakeLists.txt
@@ -56,7 +56,7 @@ add_library(px4_layer
 target_compile_definitions(px4_layer PRIVATE MODULE_NAME="px4")
 target_compile_options(px4_layer PRIVATE -Wno-cast-align) # TODO: fix and enable
 target_link_libraries(px4_layer PRIVATE work_queue px4_work_queue)
-target_link_libraries(px4_layer PRIVATE px4_daemon)
+target_link_libraries(px4_layer PRIVATE px4_daemon drivers_board)
 
 if(ENABLE_LOCKSTEP_SCHEDULER)
 	target_link_libraries(px4_layer PRIVATE lockstep_scheduler)

With this make tests works for me.

…_afer_replay_log

… into pr-exit_afer_replay_log

bkueng

Thanks @roangel

…4#11264)

Angel added 4 commits January 22, 2019 11:17

Close replay log file after replay is finished, then exit. Need to im…

acf9100

…plement exit method and add -q parameter

missing shutdown header, fixed name of function call

fdc323d

Added shutdown method for SITL

94318ab

format

a75c881

roangel changed the title ~~[WIP] Close replay log file after replay is finished, then exit~~ Close replay log file after replay is finished, then exit Jan 23, 2019

weekly-digest bot mentioned this pull request Jan 27, 2019

Weekly Digest (20 January, 2019 - 27 January, 2019) #11307

Closed

dagar requested a review from bkueng February 5, 2019 15:16

bkueng reviewed Feb 7, 2019

View reviewed changes

weekly-digest bot mentioned this pull request Feb 10, 2019

Weekly Digest (3 February, 2019 - 10 February, 2019) #11425

Closed

stale bot added the Admin: Wont fix label Jul 10, 2019

weekly-digest bot mentioned this pull request Jul 14, 2019

Weekly Digest (7 July, 2019 - 14 July, 2019) #12474

Closed

stale bot closed this Jul 24, 2019

julianoes reopened this Jul 25, 2019

stale bot removed the Admin: Wont fix label Jul 25, 2019

weekly-digest bot mentioned this pull request Jul 28, 2019

Weekly Digest (21 July, 2019 - 28 July, 2019) #12569

Closed

roangel added 2 commits August 19, 2019 13:25

Added shutdowm function for silt. Doesn't work, need to fix?

e8c98ae

Removed empty line

3474c8d

Changed defines. Now SITL has BOARD_HAS_POWER_CONTROL defined

0f78b79

roangel added 5 commits August 20, 2019 11:50

Merge branch 'master' into pr-exit_afer_replay_log

e3edf98

Added fix

bdef13e

Merge branch 'master' of github.com:roangel/Firmware into pr-exit_afe…

ad198f2

…r_replay_log

Merge branch 'master' of https://github.com/PX4/Firmware into pr-exit…

1b172c7

…_afer_replay_log

Merge branch 'pr-exit_afer_replay_log' of github.com:roangel/Firmware…

2446ee9

… into pr-exit_afer_replay_log

roangel added 2 commits August 21, 2019 10:59

Added fixes for MAC compilation

5f09a07

Merge branch 'master' of github.com:roangel/Firmware into pr-exit_afe…

beeea7b

…r_replay_log

weekly-digest bot mentioned this pull request Aug 25, 2019

Weekly Digest (18 August, 2019 - 25 August, 2019) #12803

Closed

roangel added 4 commits August 27, 2019 16:05

Merge branch 'master' into pr-exit_afer_replay_log

1b8da40

Review feedback

a9bde71

Merge branch 'master' of https://github.com/PX4/Firmware into pr-exit…

ff70249

…_afer_replay_log

Merge branch 'pr-exit_afer_replay_log' of github.com:roangel/Firmware…

17a126a

… into pr-exit_afer_replay_log

bkueng approved these changes Aug 28, 2019

View reviewed changes

bkueng merged commit e50dd7c into PX4:master Aug 28, 2019

weekly-digest bot mentioned this pull request Sep 1, 2019

Weekly Digest (25 August, 2019 - 1 September, 2019) #12858

Closed

bozkurthan pushed a commit to bozkurthan/Firmware that referenced this pull request Sep 4, 2019

replay: close replay log file after replay is finished, then exit (PX…

3ef093e

…4#11264)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Close replay log file after replay is finished, then exit #11264

Close replay log file after replay is finished, then exit #11264

roangel commented Jan 22, 2019 •

edited by AuterionWrikeBot

Loading

bkueng left a comment

bkueng Feb 7, 2019

bkueng Feb 7, 2019

stale bot commented Jul 10, 2019

stale bot commented Jul 24, 2019

julianoes commented Jul 25, 2019

roangel commented Aug 19, 2019

bkueng commented Aug 19, 2019

roangel commented Aug 19, 2019

bkueng commented Aug 20, 2019

bkueng commented Aug 21, 2019

bkueng commented Aug 27, 2019

bkueng left a comment

Close replay log file after replay is finished, then exit #11264

Close replay log file after replay is finished, then exit #11264

Conversation

roangel commented Jan 22, 2019 • edited by AuterionWrikeBot Loading

bkueng left a comment

Choose a reason for hiding this comment

bkueng Feb 7, 2019

Choose a reason for hiding this comment

bkueng Feb 7, 2019

Choose a reason for hiding this comment

stale bot commented Jul 10, 2019

stale bot commented Jul 24, 2019

julianoes commented Jul 25, 2019

roangel commented Aug 19, 2019

bkueng commented Aug 19, 2019

roangel commented Aug 19, 2019

bkueng commented Aug 20, 2019

bkueng commented Aug 21, 2019

bkueng commented Aug 27, 2019

bkueng left a comment

Choose a reason for hiding this comment

roangel commented Jan 22, 2019 •

edited by AuterionWrikeBot

Loading